From 64ca5dd30fcc981d16f31357ebd54f839b52bf01 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 7 Aug 2020 18:30:24 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 483147 -> 483287 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 3bca36d136e..06bd4f8588e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -99,6 +99,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 9af28060bc3aaddda211dfe635b821048c78694f..0b6973f76bfa690e3ae31981127d5edaaf5e9812 100644
GIT binary patch
delta 168
zcmX@TPxktL*@hOz7N!>F7M3ln|G(5{rYV%97MCdKRw(F~78mI!W#;Lp6lACCCY5I9
zq@?8}rWac)lw_plaVbE6hhvb7t6#ixK!BT%qkFJz0-9<CUETE55(SvNf{~qmN@|&Y
mUTIEF0#{llm!orhaHvyohz8goE`&+#f4;D8|MP{-KMMeOb2;Mx

delta 34
qcmcb<U-tAq*@hOz7N!>F7M3ln|G!L+H(-};U-p%C`?9ZWhFJg#dJh5s

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9..137b6e5e9b7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2